branch develop updated (47c3a29 -> cbb1294)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository nuiton-validator. See https://gitlab.nuiton.org/nuiton/nuiton-validator.git from 47c3a29 refs #32: Update struts new cbb1294 Fix releasable build [skip ci] The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit cbb1294ec04c2fb9346ca86226fb2106c6677ed4 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:16:10 2020 +0200 Fix releasable build [skip ci] Summary of changes: pom.xml | 29 ++++++++-------------- .../nuiton/validator/bean/list/package-info.java | 2 +- .../nuiton/validator/bean/simple/package-info.java | 4 +-- .../java/org/nuiton/validator/package-info.java | 2 +- src/site/site.xml | 9 ++----- .../FieldExpressionWithParamsValidatorTest.java | 16 ++++++------ 6 files changed, 25 insertions(+), 37 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository nuiton-validator. See https://gitlab.nuiton.org/nuiton/nuiton-validator.git commit cbb1294ec04c2fb9346ca86226fb2106c6677ed4 Author: Eric Chatellier <chatellier@codelutin.com> Date: Mon May 4 17:16:10 2020 +0200 Fix releasable build [skip ci] --- pom.xml | 29 ++++++++-------------- .../nuiton/validator/bean/list/package-info.java | 2 +- .../nuiton/validator/bean/simple/package-info.java | 4 +-- .../java/org/nuiton/validator/package-info.java | 2 +- src/site/site.xml | 9 ++----- .../FieldExpressionWithParamsValidatorTest.java | 16 ++++++------ 6 files changed, 25 insertions(+), 37 deletions(-) diff --git a/pom.xml b/pom.xml index 066f62f..a3fcc14 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>nuitonpom</artifactId> - <version>10.5</version> + <version>11.8-SNAPSHOT</version> </parent> <artifactId>nuiton-validator</artifactId> @@ -62,23 +62,16 @@ <properties> - <projectId>nuiton-validator</projectId> - <ciViewId>nuiton-validator</ciViewId> + <gitlabProjectName>nuiton-validator</gitlabProjectName> - <javaVersion>1.7</javaVersion> - <signatureArtifactId>java17</signatureArtifactId> + <javaVersion>1.8</javaVersion> + <signatureArtifactId>java18</signatureArtifactId> <signatureVersion>1.0</signatureVersion> - <nuitonI18nVersion>3.6.2</nuitonI18nVersion> + <nuitonI18nVersion>3.8</nuitonI18nVersion> <!-- i18n configuration --> <i18n.bundles>fr_FR,en_GB,es_ES</i18n.bundles> - - <!-- extra files to include in release --> - <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> - - <!-- Post Release configuration --> - <skipPostRelease>false</skipPostRelease> </properties> <dependencies> @@ -86,7 +79,7 @@ <dependency> <groupId>org.nuiton</groupId> <artifactId>nuiton-utils</artifactId> - <version>3.0-rc-17</version> + <version>3.0</version> </dependency> <dependency> <groupId>org.nuiton</groupId> @@ -103,7 +96,7 @@ <dependency> <groupId>org.apache.struts</groupId> <artifactId>struts2-core</artifactId> - <version>2.5.16</version> + <version>2.5.22</version> </dependency> <dependency> @@ -115,19 +108,19 @@ <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> - <version>3.5</version> + <version>3.10</version> </dependency> <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.9.3</version> + <version>1.9.4</version> </dependency> <dependency> <groupId>org.apache.commons</groupId> <artifactId>commons-collections4</artifactId> - <version>4.1</version> + <version>4.4</version> </dependency> <dependency> @@ -139,7 +132,7 @@ <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> - <version>4.12</version> + <version>4.13</version> <scope>test</scope> </dependency> diff --git a/src/main/java/org/nuiton/validator/bean/list/package-info.java b/src/main/java/org/nuiton/validator/bean/list/package-info.java index 50fe2fc..bffa4e0 100644 --- a/src/main/java/org/nuiton/validator/bean/list/package-info.java +++ b/src/main/java/org/nuiton/validator/bean/list/package-info.java @@ -22,7 +22,7 @@ /** * Package of Nuiton - BeanListValidator api. * - * <h1>The <b>BeanValidator</b> api</h1> + * <h2>The <b>BeanValidator</b> api</h2> * <p> * The {@link org.nuiton.validator.bean.list.BeanListValidator} purpose is to validate * a list of bean, with a listener api to interact with outside world. diff --git a/src/main/java/org/nuiton/validator/bean/simple/package-info.java b/src/main/java/org/nuiton/validator/bean/simple/package-info.java index 64e7622..dd53cd8 100644 --- a/src/main/java/org/nuiton/validator/bean/simple/package-info.java +++ b/src/main/java/org/nuiton/validator/bean/simple/package-info.java @@ -22,7 +22,7 @@ /** * Package of Nuiton - Simple Bean Validator api. * - * <h1>The <b>SimpleBeanValidator</b> api</h1> + * <h2>The <b>SimpleBeanValidator</b> api</h2> * <p> * The {@link org.nuiton.validator.bean.simple.SimpleBeanValidator} purpose is to validate * a bean, with a listener api to interact with outside world. @@ -38,7 +38,7 @@ * validator.addSimpleBeanValidatorListener(listener); * validator.setBean(o); * </pre> - * <h2>Obtain a validator</h2> + * <h3>Obtain a validator</h3> * To obtain a bean validator use the factory method of the * {@link org.nuiton.validator.bean.simple.SimpleBeanValidator}. * <pre> diff --git a/src/main/java/org/nuiton/validator/package-info.java b/src/main/java/org/nuiton/validator/package-info.java index f2b197f..9d50da1 100644 --- a/src/main/java/org/nuiton/validator/package-info.java +++ b/src/main/java/org/nuiton/validator/package-info.java @@ -22,7 +22,7 @@ /** * Package of Nuiton-validator api. * - * <h1>The <b>Validator</b> api</h1> + * <h2>The <b>Validator</b> api</h2> * <p> * The {@link org.nuiton.validator.NuitonValidator} is the object responsible * to launch validation for a given object and then return the result of diff --git a/src/site/site.xml b/src/site/site.xml index 55659cc..9637641 100644 --- a/src/site/site.xml +++ b/src/site/site.xml @@ -23,9 +23,9 @@ <project name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.4.0" + xmlns="http://maven.apache.org/DECORATION/1.8.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.4.0 http://maven.apache.org/xsd/decoration-1.4.0.xsd"> + xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> <bannerLeft> <name>${project.name}</name> @@ -57,10 +57,5 @@ <menu ref="reports"/> - <footer> - <div id='mavenProjectProperties' locale='fr' sourcesType='apt' - projectId='${project.projectId}' version='${project.siteDeployClassifier}'/> - </footer> - </body> </project> diff --git a/src/test/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidatorTest.java b/src/test/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidatorTest.java index f6fe064..5e5109d 100644 --- a/src/test/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidatorTest.java +++ b/src/test/java/org/nuiton/validator/xwork2/field/FieldExpressionWithParamsValidatorTest.java @@ -113,17 +113,17 @@ public class FieldExpressionWithParamsValidatorTest extends AbstractFieldValidat protected void testDoubleType() { assertEquals(0.0, bean.getDoubleValue(), 0); - assertFieldInError("doubleValue", MESSAGE + ".0", false); - assertFieldInError("doubleValue", "expression.too.big##100.0##2000.0", false); + assertFieldInError("doubleValue", MESSAGE, false); + assertFieldInError("doubleValue", "expression.too.big##100##2000", false); bean.setDoubleValue(10); - assertFieldInError("doubleValue", MESSAGE + ".0", false); - assertFieldInError("doubleValue", "expression.too.big##100.0##2000.0", false); + assertFieldInError("doubleValue", MESSAGE, false); + assertFieldInError("doubleValue", "expression.too.big##100##2000", false); bean.setDoubleValue(1000); - assertFieldInError("doubleValue", MESSAGE + ".0", true); - assertFieldInError("doubleValue", "expression.too.big##100.0##2000.0", false); + assertFieldInError("doubleValue", MESSAGE, true); + assertFieldInError("doubleValue", "expression.too.big##100##2000", false); bean.setDoubleValue(3000); - assertFieldInError("doubleValue", MESSAGE + ".0", true); - assertFieldInError("doubleValue", "expression.too.big##100.0##2000.0", true); + assertFieldInError("doubleValue", MESSAGE, true); + assertFieldInError("doubleValue", "expression.too.big##100##2000", true); } protected void testStringType() { -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm