Skip to content

Commit 976c437

Browse files

File tree

5 files changed

+21
-6
lines changed

5 files changed

+21
-6
lines changed

pom.xml

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -469,12 +469,12 @@
469469
<testng.version>6.8.8</testng.version>
470470

471471
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
472-
<thymeleaf-extras-springsecurity4.version>2.1.2.RELEASE</thymeleaf-extras-springsecurity4.version>
472+
<thymeleaf-extras-springsecurity4.version>3.0.0.RELEASE</thymeleaf-extras-springsecurity4.version>
473473

474-
<thymeleaf.togglz.version>1.1.0.RELEASE</thymeleaf.togglz.version>
474+
<thymeleaf.togglz.version>2.0.0-SNAPSHOT</thymeleaf.togglz.version>
475475

476476
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.1.RELEASE/spring-boot-dependencies/pom.xml) -->
477-
<thymeleaf.version>2.1.5.RELEASE</thymeleaf.version>
477+
<thymeleaf.version>3.0.2.RELEASE</thymeleaf.version>
478478

479479
<togglz.version>2.3.0.Final</togglz.version>
480480
<war.plugin.version>3.0.0</war.plugin.version>
@@ -919,4 +919,19 @@
919919
<maven>3.2.1</maven>
920920
</prerequisites>
921921

922+
<repositories>
923+
<repository>
924+
<releases>
925+
<enabled>false</enabled>
926+
</releases>
927+
<snapshots>
928+
<enabled>true</enabled>
929+
<checksumPolicy>fail</checksumPolicy>
930+
</snapshots>
931+
<id>oss-sonatype</id>
932+
<name>oss-sonatype</name>
933+
<url>https://oss.sonatype.org/content/repositories/snapshots/</url>
934+
</repository>
935+
</repositories>
936+
922937
</project>

src/main/resources/application-test.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ spring.messages.basename: \
2323
ru/mystamps/i18n/SpringSecurityMessages, \
2424
ru/mystamps/i18n/MailTemplates
2525

26+
spring.thymeleaf.mode: HTML
2627
spring.thymeleaf.prefix: /WEB-INF/views/
2728
spring.thymeleaf.suffix: .html
2829
spring.thymeleaf.cache: false

src/main/resources/application-travis.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spring.messages.basename: \
2121
ru/mystamps/i18n/SpringSecurityMessages, \
2222
ru/mystamps/i18n/MailTemplates
2323

24+
spring.thymeleaf.mode: HTML
2425
spring.thymeleaf.prefix: /WEB-INF/views/
2526
spring.thymeleaf.suffix: .html
2627
spring.thymeleaf.cache: true

src/main/webapp/WEB-INF/views/collection/info.html

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,6 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
210210
<script src="https://www.gstatic.com/charts/loader.js"></script>
211211
<script src="../../../../javascript/collection/info.min.js" th:src="${COLLECTION_INFO_JS}"></script>
212212
<script th:inline="javascript">
213-
/*<![CDATA[*/
214213
$(document).ready(function() {
215214
/*[+
216215
initPage(
@@ -237,8 +236,6 @@ <h4 class="panel-title" th:text="#{t_stamps_by_categories}">Stamps by categories
237236
]);
238237
/* -]*/
239238
});
240-
241-
/*]]>*/
242239
</script>
243240
<!--/*/
244241
</th:block>

vagrant/provisioning/roles/mystamps-app/templates/application-prod.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ spring.messages.basename: \
2121
ru/mystamps/i18n/SpringSecurityMessages, \
2222
ru/mystamps/i18n/MailTemplates
2323

24+
spring.thymeleaf.mode: HTML
2425
spring.thymeleaf.prefix: /WEB-INF/views/
2526
spring.thymeleaf.suffix: .html
2627
spring.thymeleaf.cache: true

0 commit comments

Comments
 (0)