Skip to content

Commit

Permalink
Spring Boot 2.1.x compatibility (#29)
Browse files Browse the repository at this point in the history
  • Loading branch information
musketyr committed Feb 9, 2022
1 parent 23b3e57 commit 28959ff
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,5 @@ dependencies {

compileOnly 'javax.servlet:javax.servlet-api:4.0.1'
compileOnly 'org.springframework:spring-webmvc:5.2.12.RELEASE'
compileOnly 'org.springframework.boot:spring-boot:2.4.1'

compileOnly 'org.springframework.boot:spring-boot:2.1.15.RELEASE'
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected WebApplicationContext createRootApplicationContext(ServletContext serv
builder.initializers(new ParentContextApplicationContextInitializer(parent));
}
builder.initializers(new ServletContextApplicationContextInitializer(servletContext));
builder.contextFactory(webApplicationType -> new AnnotationConfigServletWebServerApplicationContext());
builder.application().setApplicationContextClass(AnnotationConfigServletWebServerApplicationContext.class);
builder = configure(builder);
SpringApplication application = builder.build();
if (application.getAllSources().isEmpty() && AnnotationUtils.findAnnotation(getClass(), Configuration.class) != null) {
Expand Down

0 comments on commit 28959ff

Please sign in to comment.