Skip to content
This repository was archived by the owner on May 13, 2025. It is now read-only.

Commit 0c2ab63

Browse files
committed
Spring new version manages servlet
1 parent e412ecc commit 0c2ab63

File tree

4 files changed

+19
-25
lines changed

4 files changed

+19
-25
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ install:
44
./gradlew build
55

66
serve:
7-
./gradlew appRun
7+
./gradlew bootRun

build.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
plugins {
22
id 'java'
3-
id 'org.gretty' version '4.1.6'
3+
id 'io.spring.dependency-management' version '1.1.7'
4+
id 'org.springframework.boot' version '3.3.11'
45
id 'idea'
56
id 'groovy'
67
id 'io.github.joselion.pretty-jupiter' version '3.5.0'
78
}
89

910
java {
11+
toolchain {
12+
languageVersion = JavaLanguageVersion.of(17)
13+
}
1014
sourceCompatibility = JavaVersion.VERSION_17
1115
targetCompatibility = JavaVersion.VERSION_17
1216
}
1317

14-
ext['springBootVer'] = '3.3.2'
15-
1618
repositories {
1719
mavenCentral()
1820
}
1921

20-
gretty {
21-
springBootVersion = '3.3.2'
22-
springBoot = true
23-
servletContainer = 'jetty11'
24-
contextPath = ''
25-
}
26-
2722
configurations {
2823
providedRuntime
2924
}
3025

3126
dependencies {
3227
implementation(group: 'jakarta.xml.bind', name: 'jakarta.xml.bind-api', version: '4.0.2')
33-
implementation(group: 'jakarta.servlet', name:'jakarta.servlet-api', version:'6.1.0')
28+
providedRuntime(group: 'jakarta.servlet', name:'jakarta.servlet-api', version:'6.1.0')
3429

3530
// Spring
36-
implementation(group:'org.springframework.boot', name:'spring-boot-starter-data-jpa', version:"${springBootVer}")
37-
implementation(group:'org.springframework.boot', name:'spring-boot-starter-security', version:"${springBootVer}")
38-
implementation(group:'org.springframework.boot', name:'spring-boot-starter-validation', version:"${springBootVer}")
31+
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
32+
implementation 'org.springframework.boot:spring-boot-starter-security'
33+
implementation 'org.springframework.boot:spring-boot-starter-validation'
34+
implementation 'org.springframework.boot:spring-boot-starter-web'
35+
3936
implementation(group:'net.rakugakibox.spring.boot', name:'logback-access-spring-boot-starter', version:'2.11.0')
4037

4138
implementation group: 'org.hibernate.orm', name: 'hibernate-community-dialects', version: '6.6.13.Final'
4239

4340
implementation(group:'com.authy', name:'authy-java', version:'1.5.1')
4441
implementation(group:'com.twilio.sdk', name:'twilio', version:'10.8.0')
4542
implementation(group:'org.xerial', name:'sqlite-jdbc', version:'3.49.1.0')
43+
implementation 'org.springframework.boot:spring-boot-starter-actuator'
4644

4745
testImplementation(group: 'junit', name:'junit', version:'4.13.2')
48-
testImplementation(group:'org.springframework.boot', name:'spring-boot-starter-test', version:"${springBootVer}")
46+
testImplementation 'org.springframework.boot:spring-boot-starter-test'
47+
testImplementation 'org.springframework.security:spring-security-test'
48+
4949
// Groovy
5050
testImplementation (group: 'org.apache.groovy', name: 'groovy-all', version: '4.0.26', ext: 'pom')
5151

src/main/java/com/twilio/accountsecurity/AccountSecurityJavaApplication.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,8 @@
55
import org.springframework.boot.autoconfigure.SpringBootApplication;
66

77
@SpringBootApplication
8-
public class AccountSecurityJavaApplication implements CommandLineRunner {
8+
public class AccountSecurityJavaApplication {
99
public static void main(String[] args) {
1010
SpringApplication.run(AccountSecurityJavaApplication.class, args);
1111
}
12-
13-
/**
14-
* Method that runs on app initialization. It will parse and insert the questions in the DB
15-
* on every app initialization
16-
*/
17-
@Override
18-
public void run(String... strings) throws Exception {
19-
}
2012
}

src/main/java/com/twilio/accountsecurity/config/WebSecurityConfig.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@
77
import org.springframework.context.annotation.Configuration;
88
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
99
import org.springframework.security.config.annotation.web.builders.HttpSecurity;
10+
import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
1011
import org.springframework.security.crypto.password.PasswordEncoder;
1112
import org.springframework.security.web.SecurityFilterChain;
1213
import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
1314

1415

1516
@Configuration
17+
@EnableWebSecurity
1618
public class WebSecurityConfig {
1719

1820
@Autowired

0 commit comments

Comments
 (0)