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.

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

Migrate to Spring Boot 3 #80

Merged
merged 1 commit into from
Jan 22, 2024
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
1 change: 0 additions & 1 deletion hawkbit-custom-theme-example/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion hawkbit-custom-theme-example/README.md

This file was deleted.

72 changes: 0 additions & 72 deletions hawkbit-custom-theme-example/pom.xml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 1 addition & 0 deletions hawkbit-device-simulator/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@
<dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>4.5.14</version>
</dependency>
<!-- TEST -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
import java.util.Random;
import java.util.concurrent.TimeUnit;

import javax.validation.constraints.NotEmpty;
import jakarta.validation.constraints.NotEmpty;

import org.eclipse.hawkbit.simulator.AbstractSimulatedDevice.Protocol;
import org.springframework.boot.context.properties.ConfigurationProperties;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected SecurityFilterChain filterChainBasicAuth(final HttpSecurity http) thro
return http
.csrf(AbstractHttpConfigurer::disable)
.authorizeHttpRequests(amrmRegistry -> amrmRegistry
.antMatchers("/").permitAll()
.requestMatchers("/").permitAll()
.anyRequest().authenticated())
.httpBasic(Customizer.withDefaults())
.exceptionHandling(configurer -> configurer.authenticationEntryPoint((request, response, e) -> {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public class NoAuthSecurityConfiguration {
@Bean
protected SecurityFilterChain filterChainNoAuth(final HttpSecurity httpSec) throws Exception {
return httpSec
.authorizeRequests(amrmRegistry -> amrmRegistry.antMatchers("/**").permitAll())
.authorizeRequests(amrmRegistry -> amrmRegistry.requestMatchers("/**").permitAll())
.csrf(AbstractHttpConfigurer::disable)
.build();
}
Expand Down
10 changes: 3 additions & 7 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<parent>
<groupId>org.eclipse.hawkbit</groupId>
<artifactId>hawkbit-parent</artifactId>
<version>0.4.1</version>
<version>0-SNAPSHOT</version>
</parent>

<artifactId>hawkbit-examples-parent</artifactId>
Expand Down Expand Up @@ -53,7 +53,6 @@
</pluginRepositories>

<modules>
<module>hawkbit-custom-theme-example</module>
<module>hawkbit-device-simulator</module>
<module>hawkbit-example-core-feign-client</module>
<module>hawkbit-example-ddi-feign-client</module>
Expand All @@ -62,8 +61,8 @@
</modules>

<properties>
<revision>0.4.0-SNAPSHOT</revision>
<hawkbit.version>0.4.1</hawkbit.version>
<revision>0-SNAPSHOT</revision>
<hawkbit.version>0-SNAPSHOT</hawkbit.version>

<!-- Release - START -->
<release.scm.connection>scm:git:[email protected]:eclipse/hawkbit-examples.git</release.scm.connection>
Expand Down Expand Up @@ -120,9 +119,6 @@
<exclude>.git*</exclude>
<exclude>**/*.sql</exclude>
<exclude>eclipse_codeformatter.xml</exclude>
<exclude>**/addons.scss</exclude>
<exclude>**/VAADIN/widgetsets/**</exclude>
<exclude>**/resources/VAADIN/themes/exampletheme/**</exclude>
<exclude>.sonar</exclude>
<exclude>**/docker/**</exclude>
<exclude>**/.sonar/**</exclude>
Expand Down