dubey/WebGoat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First attempt at moving to Spring Boot 2

Browse Source
This commit is contained in:
Nanne Baars
2019-09-12 17:22:03 +02:00
parent a56f41e0ea
commit 361249c666
33 changed files with 271 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
webgoat-server/pom.xml
View File

@ -147,12 +147,11 @@
<!--</dependency>-->
<!-- /lessons -->
<!-- devtools no longer working with Java 11 and Spring Boot version 1.* enable again once we move to 2.0-->
<!--<dependency>-->
<!--<groupId>org.springframework.boot</groupId>-->
<!--<artifactId>spring-boot-devtools</artifactId>-->
<!--<optional>true</optional>-->
<!--</dependency>-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-devtools</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
@ -171,7 +170,7 @@
<requiresUnpack>
<dependency>
<groupId>org.thymeleaf.extra</groupId>
<artifactId>thymeleaf-extras-springsecurity4</artifactId>
<artifactId>thymeleaf-extras-springsecurity5++</artifactId>
</dependency>
<dependency>
<groupId>org.asciidoctor</groupId>

2
webgoat-server/src/main/java/org/owasp/webgoat/HSQLDBDatabaseConfig.java
View File

@ -4,7 +4,7 @@ import lombok.extern.slf4j.Slf4j;
import org.hsqldb.server.Server;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.jdbc.DataSourceBuilder;
import org.springframework.boot.jdbc.DataSourceBuilder;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.DependsOn;

8
webgoat-server/src/main/java/org/owasp/webgoat/StartWebGoat.java
View File

@ -27,11 +27,7 @@ package org.owasp.webgoat;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
import org.springframework.context.annotation.Import;
import java.util.Map;
import org.springframework.boot.web.servlet.support.SpringBootServletInitializer;
/**
* Main entry point, this project is here to get all the lesson jars included to the final jar file
@ -39,7 +35,7 @@ import java.util.Map;
* @author nbaars
* @date 2/21/17
*/
@SpringBootApplication
@SpringBootApplication(scanBasePackages = "org.owasp.webgoat")
@Slf4j
public class StartWebGoat extends SpringBootServletInitializer {