Skip to content

Commit 8e9c36c

Browse files
Doha2012Eugen
authored andcommitted
fix spring config (#2364)
1 parent 8137c20 commit 8e9c36c

7 files changed

Lines changed: 17 additions & 10 deletions

File tree

  • spring-security-client
    • spring-security-jsp-authentication/src/main/java/org/baeldung/config
    • spring-security-jsp-authorize/src/main/java/org/baeldung/config
    • spring-security-jsp-config/src/main/java/org/baeldung/config
    • spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config
    • spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config
    • spring-security-thymeleaf-config/src/main/java/org/baeldung/config
  • spring-security-core/src/main/java/org/baeldung/app

spring-security-client/spring-security-jsp-authentication/src/main/java/org/baeldung/config/Application.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
56
import org.springframework.boot.builder.SpringApplicationBuilder;
6-
import org.springframework.boot.context.web.SpringBootServletInitializer;
7+
import org.springframework.boot.web.support.SpringBootServletInitializer;
78

8-
@SpringBootApplication
9+
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
910
public class Application extends SpringBootServletInitializer {
1011

1112
@Override

spring-security-client/spring-security-jsp-authorize/src/main/java/org/baeldung/config/Application.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
56
import org.springframework.boot.builder.SpringApplicationBuilder;
6-
import org.springframework.boot.context.web.SpringBootServletInitializer;
7+
import org.springframework.boot.web.support.SpringBootServletInitializer;
78

8-
@SpringBootApplication
9+
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
910
public class Application extends SpringBootServletInitializer {
1011

1112
@Override

spring-security-client/spring-security-jsp-config/src/main/java/org/baeldung/config/Application.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
56
import org.springframework.boot.builder.SpringApplicationBuilder;
6-
import org.springframework.boot.context.web.SpringBootServletInitializer;
7+
import org.springframework.boot.web.support.SpringBootServletInitializer;
78

8-
@SpringBootApplication
9+
@SpringBootApplication(exclude = { DataSourceAutoConfiguration.class })
910
public class Application extends SpringBootServletInitializer {
1011

1112
@Override

spring-security-client/spring-security-thymeleaf-authentication/src/main/java/org/baeldung/config/Application.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.web.support.SpringBootServletInitializer;
56

67
@SpringBootApplication
7-
public class Application {
8+
public class Application extends SpringBootServletInitializer {
89

910
public static void main(String[] args) {
1011
SpringApplication.run(Application.class, args);

spring-security-client/spring-security-thymeleaf-authorize/src/main/java/org/baeldung/config/Application.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.web.support.SpringBootServletInitializer;
56

67
@SpringBootApplication
7-
public class Application {
8+
public class Application extends SpringBootServletInitializer {
89

910
public static void main(String[] args) {
1011
SpringApplication.run(Application.class, args);

spring-security-client/spring-security-thymeleaf-config/src/main/java/org/baeldung/config/Application.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
5+
import org.springframework.boot.web.support.SpringBootServletInitializer;
56

67
@SpringBootApplication
7-
public class Application {
8+
public class Application extends SpringBootServletInitializer {
89

910
public static void main(String[] args) {
1011
SpringApplication.run(Application.class, args);

spring-security-core/src/main/java/org/baeldung/app/App.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@
33
import org.springframework.boot.SpringApplication;
44
import org.springframework.boot.autoconfigure.SpringBootApplication;
55
import org.springframework.boot.autoconfigure.domain.EntityScan;
6+
import org.springframework.boot.web.support.SpringBootServletInitializer;
67
import org.springframework.context.annotation.ComponentScan;
78
import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
89

910
@SpringBootApplication
1011
@EnableJpaRepositories("org.baeldung.repository")
1112
@ComponentScan("org.baeldung")
1213
@EntityScan("org.baeldung.entity")
13-
public class App {
14+
public class App extends SpringBootServletInitializer {
1415
public static void main(String[] args) {
1516
SpringApplication.run(App.class, args);
1617
}

0 commit comments

Comments
 (0)