Skip to content

Commit 74f8b18

Browse files
ShkarinShkarin
committed
Merge branch 'php-coder/master'
2 parents 0f1a51f + 9243c12 commit 74f8b18

File tree

25 files changed

+568
-232
lines changed

25 files changed

+568
-232
lines changed

‎.editorconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
# top-most EditorConfig file
88
root = true
99

10-
[*.{sh,js,sql,css,xml,html,java,groovy,properties}]
10+
[*.{sh,js,sql,css,xml,html,java,groovy,properties,robot}]
1111
indent_style = tab
1212
indent_size = 4
1313
charset = utf-8

‎.travis.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ env:
55
- SPRING_PROFILES_ACTIVE=test
66
- SPRING_PROFILES_ACTIVE=travis
77
global:
8+
- MAVEN_OPTS='-Xss256k'
89
- secure: "fBav56BzY+A+Vs1g9YSfo1oLDCO1rFrXl49lJkOA5/XpnsKEEs4lI2RcOzz0wiJKXFNgcliiAJWoYMI8Esqz+lkyFWan4ij5Co0UzJcytDuY+2o+jaqwx45DuDYPogABzT+hWjLCxQLLG46gUkChzT8kcvOOn6JxC7Ff8q5MnoM="
910

1011
before_script:

‎Dangerfile‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -667,3 +667,36 @@ else
667667
print_errors_summary 'maven-failsafe-plugin', errors_count, 'https://github.com/php-coder/mystamps/wiki/integration-tests'
668668
end
669669
end
670+
671+
commits = git.commits.size
672+
if commits > 1
673+
if git.commits.any? { |c| c.message =~ /^Merge branch/ || c.message =~ /^Merge remote-tracking branch/ }
674+
fail(
675+
"danger check: pull request contains merge commits! "\
676+
"Please, rebase your branch to get rid of them: "\
677+
"`git rebase master #{github.branch_for_head}`"
678+
)
679+
else
680+
warn(
681+
"danger check: pull request contains #{commits} commits while most of the cases it should have only one.\n"\
682+
"If it's not a special case you should squash commits into single one.\n"\
683+
"You can read how to do it here: https://davidwalsh.name/squash-commits-git\n"\
684+
"But be careful because **it can destroy** all your changes!"
685+
)
686+
end
687+
end
688+
689+
if github.branch_for_head !~ /^gh[0-9]+_/
690+
warn("danger check: branch `#{github.branch_for_head}` does not comply with our best practices. "\
691+
"Branch name should use the following scheme: `ghXXX_meaningful-name` where `XXX` is an issue number. "\
692+
"Next time, please, use this scheme :)"
693+
)
694+
end
695+
696+
all_checks_passed = violation_report[:errors].empty? && violation_report[:warnings].empty? && violation_report[:messages].empty?
697+
if all_checks_passed
698+
message(
699+
"@#{github.pr_author} thank you for the PR! All quality checks have been passed! "\
700+
"Next step is to wait when @php-coder will review this code"
701+
)
702+
end

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
[![Build Status](https://travis-ci.org/php-coder/mystamps.svg?branch=master)](https://travis-ci.org/php-coder/mystamps)
44
[![Dependency Status](https://www.versioneye.com/user/projects/55b783256537620017001225/badge.svg?style=flat)](https://www.versioneye.com/user/projects/55b783256537620017001225)
55
[![Coverage Status](https://coveralls.io/repos/php-coder/mystamps/badge.svg?branch=master)](https://coveralls.io/r/php-coder/mystamps)
6-
[![Stories in Ready](https://badge.waffle.io/php-coder/mystamps.png?label=ready)](https://waffle.io/php-coder/mystamps)
76

87
## What's it?
98

@@ -46,5 +45,5 @@ If you are programmer/sysadmin or you just feeling that you are able to run loca
4645
* *Validation*: JSR-303 (Hibernate Validator)
4746
* *Logging*: Slf4j (Logback)
4847
* *Unit tests*: Groovy and Spock Framework (for Java code), jasmine (for JavaScript code)
49-
* *Integration tests*: Selenium2, TestNG and fest-assert
48+
* *Integration tests*: Selenium2, RobotFramework, TestNG and fest-assert
5049
* *Others*: Lombok, Togglz, WebJars

‎docker/Dockerfile‎

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# Parents Dockerfiles:
2+
# https://github.com/tianon/docker-brew-debian/blob/a3d2e76fdd618d1ca1b145c0a2268e828d547ea2/jessie/Dockerfile
3+
# https://github.com/docker-library/buildpack-deps/blob/a0a59c61102e8b079d568db69368fb89421f75f2/jessie/curl/Dockerfile
4+
# https://github.com/docker-library/openjdk/blob/445f8b8d18d7c61e2ae7fda76d8883b5d51ae0a5/8-jre/Dockerfile
5+
FROM openjdk:8u121-jre
6+
7+
# Informs Docker that the container listens on the specified network ports at runtime.
8+
# See also: https://docs.docker.com/engine/reference/builder/#expose
9+
EXPOSE 8080
10+
11+
# Sets active Spring profile. Possible values are: test, prod and travis.
12+
# See also: https://docs.docker.com/engine/reference/builder/#env
13+
ENV SPRING_PROFILES_ACTIVE=test
14+
15+
# Creates base directories and unprivileged user.
16+
# See also: https://docs.docker.com/engine/reference/builder/#run
17+
RUN mkdir /data \
18+
&& useradd mystamps --home-dir /data/mystamps --create-home --comment 'MyStamps' \
19+
&& mkdir /data/uploads /data/heap-dumps \
20+
&& chown mystamps:mystamps /data/uploads /data/heap-dumps
21+
22+
# Creates mount points and marks them as holding externally mounted volumes from native host.
23+
# See also: https://docs.docker.com/engine/reference/builder/#volume
24+
VOLUME /data/uploads /data/heap-dumps
25+
26+
# Sets the user name to use when running the image and for any subsequent RUN, CMD and ENTRYPOINT instructions.
27+
# See also: https://docs.docker.com/engine/reference/builder/#user
28+
USER mystamps
29+
30+
# Sets the working directory for any subsequent RUN, CMD, ENTRYPOINT, COPY and ADD instructions.
31+
# See also: https://docs.docker.com/engine/reference/builder/#workdir
32+
WORKDIR /data/mystamps
33+
34+
# Copies mystamps.war into destination directory. File is created with a UID and GID of 0.
35+
# See also: https://docs.docker.com/engine/reference/builder/#copy
36+
COPY mystamps.war /data/mystamps
37+
38+
# Sets the command to be executed during container startup.
39+
# See also: https://docs.docker.com/engine/reference/builder/#cmd
40+
CMD [ "java" \
41+
, "-XX:+HeapDumpOnOutOfMemoryError" \
42+
, "-XX:HeapDumpPath=/data/heap-dumps" \
43+
, "-XX:+UseCompressedOops" \
44+
, "-Dsun.rmi.dgc.client.gcInterval=86400000" \
45+
, "-Dsun.rmi.dgc.server.gcInterval=86400000" \
46+
, "-Djava.security.egd=file:/dev/./urandom" \
47+
, "-Xmx128m" \
48+
, "-Xss256k" \
49+
, "-Dserver.address=0.0.0.0" \
50+
, "-jar" \
51+
, "mystamps.war" \
52+
]

‎docker/Makefile‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
build:
2+
ln -v ../target/mystamps.war mystamps.war && \
3+
docker build --tag mystamps:0.3.0 .; \
4+
rm -fv mystamps.war
5+
6+
start:
7+
docker run --name mystamps --publish 8080:8080 --detach mystamps:0.3.0
8+
9+
stop:
10+
docker stop mystamps
11+
12+
remove:
13+
docker rm mystamps
14+
15+
remove-completely:
16+
docker rm -v mystamps
17+
18+
.PHONY: build start stop remove remove-completely

‎pom.xml‎

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
<version>${slf4j.version}</version>
4141
</dependency>
4242

43-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
43+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter/pom.xml -->
4444
<dependency>
4545
<groupId>org.springframework.boot</groupId>
4646
<artifactId>spring-boot-starter</artifactId>
@@ -52,7 +52,7 @@
5252
</exclusions>
5353
</dependency>
5454

55-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
55+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-jdbc/pom.xml -->
5656
<dependency>
5757
<groupId>org.springframework.boot</groupId>
5858
<artifactId>spring-boot-starter-jdbc</artifactId>
@@ -64,7 +64,7 @@
6464
</exclusions>
6565
</dependency>
6666

67-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
67+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-jetty/pom.xml -->
6868
<dependency>
6969
<groupId>org.springframework.boot</groupId>
7070
<artifactId>spring-boot-starter-jetty</artifactId>
@@ -84,25 +84,25 @@
8484
</exclusions>
8585
</dependency>
8686

87-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
87+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-logging/pom.xml -->
8888
<dependency>
8989
<groupId>org.springframework.boot</groupId>
9090
<artifactId>spring-boot-starter-logging</artifactId>
9191
</dependency>
9292

93-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-mail/pom.xml -->
93+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-mail/pom.xml -->
9494
<dependency>
9595
<groupId>org.springframework.boot</groupId>
9696
<artifactId>spring-boot-starter-mail</artifactId>
9797
</dependency>
9898

99-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-security/pom.xml -->
99+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-security/pom.xml -->
100100
<dependency>
101101
<groupId>org.springframework.boot</groupId>
102102
<artifactId>spring-boot-starter-security</artifactId>
103103
</dependency>
104104

105-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
105+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-thymeleaf/pom.xml -->
106106
<dependency>
107107
<groupId>org.springframework.boot</groupId>
108108
<artifactId>spring-boot-starter-thymeleaf</artifactId>
@@ -114,7 +114,7 @@
114114
</exclusions>
115115
</dependency>
116116

117-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-web/pom.xml -->
117+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-web/pom.xml -->
118118
<dependency>
119119
<groupId>org.springframework.boot</groupId>
120120
<artifactId>spring-boot-starter-web</artifactId>
@@ -164,6 +164,7 @@
164164
<scope>provided</scope>
165165
</dependency>
166166

167+
<!-- https://docs.jboss.org/hibernate/stable/validator/reference/en-US/html_single/?v=5.2#validator-annotation-processor -->
167168
<dependency>
168169
<groupId>org.hibernate</groupId>
169170
<artifactId>hibernate-validator-annotation-processor</artifactId>
@@ -373,7 +374,7 @@
373374

374375
<!--
375376
For ConfigFileApplicationContextInitializer class.
376-
https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-test/pom.xml
377+
https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-test/pom.xml
377378
-->
378379
<dependency>
379380
<groupId>org.springframework.boot</groupId>
@@ -405,13 +406,16 @@
405406
</dependencies>
406407

407408
<parent>
408-
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
409+
<!-- https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml -->
409410
<groupId>org.springframework.boot</groupId>
410411
<artifactId>spring-boot-starter-parent</artifactId>
411-
<version>1.4.3.RELEASE</version>
412+
<version>1.4.5.RELEASE</version>
412413
</parent>
413414

414415
<properties>
416+
<!-- Set JVM options for maven-surefire-plugin and maven-failsafe-plugin -->
417+
<argLine>-Xss256k</argLine>
418+
415419
<!-- Don't forget to update version in the Url class -->
416420
<bootstrap.version>3.3.7</bootstrap.version>
417421

@@ -421,10 +425,10 @@
421425
<codenarc.plugin.version>0.22-1</codenarc.plugin.version>
422426
<codenarc.version>0.25.2</codenarc.version>
423427

424-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
428+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
425429
<commons-dbcp.version>1.4</commons-dbcp.version>
426430

427-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
431+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
428432
<commons-pool.version>1.5.4</commons-pool.version>
429433

430434
<commons.lang.version>3.4</commons.lang.version>
@@ -442,48 +446,48 @@
442446
<gmaven.plugin.version>1.4</gmaven.plugin.version>
443447
<gmaven.runtime.plugin.version>1.5</gmaven.runtime.plugin.version>
444448

445-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
449+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
446450
<groovy.version>2.0.8</groovy.version>
447451

448-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
452+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
449453
<h2.version>1.4.193</h2.version>
450454

451-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
455+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
452456
<hibernate-validator.version>5.2.4.Final</hibernate-validator.version>
453457

454-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
458+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
455459
<htmlunit.version>2.21</htmlunit.version>
456460

457-
<jacoco.plugin.version>0.7.7.201606060606</jacoco.plugin.version>
461+
<jacoco.plugin.version>0.7.9</jacoco.plugin.version>
458462
<jasmine.plugin.version>2.2</jasmine.plugin.version>
459463

460-
<!-- Redefine default value from spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
464+
<!-- Redefine default value from spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
461465
<java.version>1.8</java.version>
462466

463467
<javadoc.plugin.version>2.10.4</javadoc.plugin.version>
464468

465-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
469+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
466470
<javax-mail.version>1.5.4</javax-mail.version>
467471

468472
<javax.validation.version>1.1.0.Final</javax.validation.version>
469473

470-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
474+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
471475
<jetty.version>9.2.18.v20160721</jetty.version>
472476

473477
<!-- Don't forget to update version in the Url class -->
474478
<jquery.version>1.9.1</jquery.version>
475479

476480
<license.plugin.version>3.0</license.plugin.version>
477481

478-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
482+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
479483
<liquibase.version>3.5.3</liquibase.version>
480484

481-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
485+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
482486
<lombok.version>1.16.14</lombok.version>
483487

484488
<minify.plugin.version>1.7.6</minify.plugin.version>
485489

486-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
490+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
487491
<mysql.version>5.1.40</mysql.version>
488492

489493
<native2ascii.plugin.version>1.0-beta-1</native2ascii.plugin.version>
@@ -499,35 +503,35 @@
499503
<!-- Don't forget to update version in the Url class -->
500504
<selectizejs.version>0.12.3</selectizejs.version>
501505

502-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
506+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
503507
<selenium.version>2.53.1</selenium.version>
504508

505-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
509+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
506510
<servlet-api.version>3.1.0</servlet-api.version>
507511

508512
<skipUnitTests>false</skipUnitTests>
509513

510-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
514+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
511515
<slf4j.version>1.7.24</slf4j.version>
512516

513517
<sortpom.plugin.version>2.5.0</sortpom.plugin.version>
514518

515-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
519+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
516520
<spock.version>1.0-groovy-2.0</spock.version>
517521

518-
<!-- Define default value for spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
522+
<!-- Define default value for spring-boot-starter-parent (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-starters/spring-boot-starter-parent/pom.xml) -->
519523
<start-class>ru.mystamps.web.support.spring.boot.ApplicationBootstrap</start-class>
520524

521525
<subethasmtp.version>3.1.7</subethasmtp.version>
522526
<surefire.plugin.version>2.19.1</surefire.plugin.version>
523527
<testng.version>6.8.8</testng.version>
524528

525-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
529+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
526530
<thymeleaf-extras-springsecurity4.version>3.0.2.RELEASE</thymeleaf-extras-springsecurity4.version>
527531

528532
<thymeleaf.togglz.version>2.0.0.RELEASE</thymeleaf.togglz.version>
529533

530-
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.3.RELEASE/spring-boot-dependencies/pom.xml) -->
534+
<!-- Redefine default value from spring-boot-dependencies (https://github.com/spring-projects/spring-boot/blob/v1.4.5.RELEASE/spring-boot-dependencies/pom.xml) -->
531535
<thymeleaf.version>3.0.3.RELEASE</thymeleaf.version>
532536

533537
<togglz.version>2.3.0.Final</togglz.version>

‎src/main/java/ru/mystamps/web/model/ActivateAccountForm.java‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,18 @@ public class ActivateAccountForm implements ActivateAccountDto {
9797
private String name;
9898

9999
@NotEmpty(groups = Password1Checks.class)
100-
@Size(
101-
min = ValidationRules.PASSWORD_MIN_LENGTH,
102-
message = "{value.too-short}",
103-
groups = Password2Checks.class
104-
)
100+
@Size.List({
101+
@Size(
102+
min = ValidationRules.PASSWORD_MIN_LENGTH,
103+
message = "{value.too-short}",
104+
groups = Password2Checks.class
105+
),
106+
@Size(
107+
max = ValidationRules.PASSWORD_MAX_LENGTH,
108+
message = "{value.too-long}",
109+
groups = Password2Checks.class
110+
)
111+
})
105112
private String password;
106113

107114
@NotEmpty(groups = PasswordConfirmation1Checks.class)

0 commit comments

Comments
 (0)