Skip to content

Commit a92ec87

Browse files
donhuvydonhuvy
committed
Update version Bootstrap, jQuery etc. Polish source code.
1 parent 4e489e7 commit a92ec87

26 files changed

+93
-78
lines changed

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
<groupId>pl.codeleak.demos.sbt</groupId>
66
<artifactId>spring-boot-thymeleaf</artifactId>
7-
<version>1.0</version>
7+
<version>1.0.0-SNAPSHOT</version>
88
<name>spring-boot-thymeleaf</name>
99
<packaging>war</packaging>
1010

@@ -13,7 +13,7 @@
1313
<parent>
1414
<groupId>org.springframework.boot</groupId>
1515
<artifactId>spring-boot-starter-parent</artifactId>
16-
<version>1.5.2.RELEASE</version>
16+
<version>1.5.4.RELEASE</version>
1717
</parent>
1818

1919
<!-- Spring IO Platform for dependency management -->
@@ -38,10 +38,10 @@
3838
<failOnMissingWebXml>false</failOnMissingWebXml>
3939
<!-- Overriding version of selected dependencies -->
4040
<!-- Work when using spring-boot-starter-parent, not platform-bom -->
41-
<thymeleaf.version>3.0.3.RELEASE</thymeleaf.version>
41+
<thymeleaf.version>3.0.6.RELEASE</thymeleaf.version>
4242
<thymeleaf-extras-java8time.version>3.0.0.RELEASE</thymeleaf-extras-java8time.version>
43-
<thymeleaf-layout-dialect.version>2.2.0</thymeleaf-layout-dialect.version>
44-
<assertj.version>3.6.2</assertj.version>
43+
<thymeleaf-layout-dialect.version>2.2.2</thymeleaf-layout-dialect.version>
44+
<assertj.version>3.8.0</assertj.version>
4545
</properties>
4646

4747
<!-- Add typical dependencies for a web application -->
@@ -74,12 +74,12 @@
7474
<dependency>
7575
<groupId>org.webjars</groupId>
7676
<artifactId>bootstrap</artifactId>
77-
<version>3.3.6</version>
77+
<version>3.3.7</version>
7878
</dependency>
7979
<dependency>
8080
<groupId>org.webjars</groupId>
8181
<artifactId>jquery</artifactId>
82-
<version>2.2.1</version>
82+
<version>3.2.1</version>
8383
</dependency>
8484
<!-- Test -->
8585
<dependency>
@@ -90,7 +90,7 @@
9090
<dependency>
9191
<groupId>org.seleniumhq.selenium</groupId>
9292
<artifactId>selenium-java</artifactId>
93-
<version>2.53.1</version>
93+
<version>3.4.0</version>
9494
<scope>test</scope>
9595
</dependency>
9696
<!-- Provided (for embedded war support) -->

‎src/main/java/pl/codeleak/demos/sbt/Application.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ public class Application {
1111
public static void main(String[] args) {
1212
SpringApplication.run(Application.class);
1313
}
14+
1415
}

‎src/main/java/pl/codeleak/demos/sbt/ServletInitializer.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,10 @@
44
import org.springframework.boot.web.support.SpringBootServletInitializer;
55

66
public class ServletInitializer extends SpringBootServletInitializer {
7+
78
@Override
89
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
910
return application.sources(Application.class);
1011
}
12+
1113
}

‎src/main/java/pl/codeleak/demos/sbt/home/HomeController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,5 @@ String index(Model model) {
2121
java.util.Properties properties() {
2222
return System.getProperties();
2323
}
24+
2425
}

‎src/main/java/pl/codeleak/demos/sbt/security/AuditApplicationEventListener.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ public void onAuditEvent(AuditApplicationEvent event) {
3030
AuditEvent actualAuditEvent = event.getAuditEvent();
3131

3232
LOG.info("On audit application event: timestamp: {}, principal: {}, type: {}, data: {}",
33-
actualAuditEvent.getTimestamp(),
34-
actualAuditEvent.getPrincipal(),
35-
actualAuditEvent.getType(),
36-
actualAuditEvent.getData()
33+
actualAuditEvent.getTimestamp(),
34+
actualAuditEvent.getPrincipal(),
35+
actualAuditEvent.getType(),
36+
actualAuditEvent.getData()
3737
);
3838
applicationEventPublisher.publishEvent(
39-
new AuditApplicationEvent(
40-
new AuditEvent(actualAuditEvent.getPrincipal(), "CUSTOM_AUDIT_EVENT")
41-
)
39+
new AuditApplicationEvent(
40+
new AuditEvent(actualAuditEvent.getPrincipal(), "CUSTOM_AUDIT_EVENT")
41+
)
4242
);
4343
}
4444

@@ -47,4 +47,5 @@ public void onAuditEvent(AuditApplicationEvent event) {
4747
public void onCustomAuditEvent(AuditApplicationEvent event) {
4848
LOG.info("Handling custom audit event ...");
4949
}
50+
5051
}

‎src/main/java/pl/codeleak/demos/sbt/security/AuditEventListener.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,13 @@ public AuditEventListener(AuditEventRepository auditEventRepository) {
2525
protected void onAuditEvent(AuditEvent event) {
2626

2727
LOG.info("On audit event: timestamp: {}, principal: {}, type: {}, data: {}",
28-
event.getTimestamp(),
29-
event.getPrincipal(),
30-
event.getType(),
31-
event.getData()
28+
event.getTimestamp(),
29+
event.getPrincipal(),
30+
event.getType(),
31+
event.getData()
3232
);
3333

3434
auditEventRepository.add(event);
3535
}
36+
3637
}

‎src/main/java/pl/codeleak/demos/sbt/thymeleaf/ThymeleafObjects.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,4 +54,5 @@ public UrlService urlService() {
5454
public interface UrlService {
5555
String getApplicationUrl();
5656
}
57+
5758
}

‎src/main/java/pl/codeleak/demos/sbt/thymeleaf/ThymeleafTextTemplates.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
/**
1818
* Using text templates with Thymeleaf.
19-
*
19+
* <p>
2020
* See http://blog.codeleak.pl/2017/03/getting-started-with-thymeleaf-3-text.html
2121
*/
2222
@Controller
@@ -101,4 +101,5 @@ public void setTags(String tags) {
101101
this.tags = tags;
102102
}
103103
}
104+
104105
}

‎src/main/resources/application-dev.properties

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
#
22
# Development profile with templates and static resources reloading: http://blog.codeleak.pl/2016/12/thymeleaf-reload-templates-and-static-resources.html
33
#
4-
54
# Path to project
65
project.base-dir=file:///C:/Projects/github/spring-boot-thymeleaf
7-
86
# Templates reloading during development
97
spring.thymeleaf.prefix=${project.base-dir}/src/main/resources/templates/
108
spring.thymeleaf.cache=false
11-
129
# Static resources reloading during development
1310
spring.resources.static-locations=${project.base-dir}/src/main/resources/static/
1411
spring.resources.cache-period=0
15-

‎src/main/resources/application.properties

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
spring.thymeleaf.cache=true
2-
32
security.basic.enabled=false
43
security.user.name=user
54
security.user.password=demo
6-
7-
management.security.enabled=${security.basic.enabled}
5+
management.security.enabled=${security.basic.enabled}

0 commit comments

Comments
 (0)